bitkeeper revision 1.1159.258.68 (4244133awyHq01j9R23NzaSBfEq5Dg)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Fri, 25 Mar 2005 13:33:46 +0000 (13:33 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Fri, 25 Mar 2005 13:33:46 +0000 (13:33 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-2.0-testing.bk-clean


Trivial merge